Clean and code style