Code cleanup

Removed redundencies