Fixed previous commits, cleaned project

Hope it helps! :palm_tree: