Cleaned up the coding style