Cleaned project & worked on logger