lint and pretty
Cleaned up