Cleanup & Recommended Changes from Reddit