OCD taking over as I review the code and get a feel for the app