Clean up naming and comments