Housekeeping
Started making required changes