Improve code readability and stick to best practices