Removed todos and fixed formatting