Feature/cleanup

A cleanup of the app
Stop forgetting about subscriptions, minor accessibility changes.
Easier to read, move the logic outside of the property setter