Cleanup comments + imports