Code Style
Code style part 2
Initial implementation