Basic cleanup

Cleaned Up methods after integration with app.kotive.com