cleanup whitspace and imports