cleaned up mess :)