cleanup and added placeholder for view and view models