Cleanups thanks to Ivan Stankovic