Style changes
Decoupling operations
New header