Cleaned up code style