Style and code organization changes