Cleanup usings + clean whitespaces