Cleaned up code style issues