- removed redundant code and clean up