Performed clean-up in code. Removed redundant parts.