Cleaned up coding standards