commented Store
cleanup in controllers