fix naming convention
fix indentation and style