Make things better

This branch improves the readability and consistency of the entire codebase.