Adding more feedback and improving general hygine of the code