fixed private query and a cleaned up the project