Cleaned Project a little bit