Cleaning up whitespaces, removing redundant imports