code cleaning
different views of functionality for owner/viewer