Cleaned up coding style