Cleaned unused srcs in project and added some modifiers