Cleanup (whitespace, remove unused)