Fixing some styles cleaning up code