[PATCH 1/4] Improve code style and readability