Cleaned coding style