Improvig code readability