Cleaned up the code style