Cleaned up code + started to use lenses