Clean code

[lucbettaieb]

Code should be gone through for general optimizations as well as style adherence.

• [x] Style fixup
• [ ] Runtime fixes