further refactored code

Further refactored code

Finished refactor, updated readme, created env.example

Finished code refactor

Fix

Fixed updating and removing comments