Project cleanup and refinement

Hope it helps! :palm_tree: