Clean up naming, whitespace, dependencies, etc