Cleaned code

Misc. Changes