master port editable
outsourced some methods in the application class
cleanup