Cleaned Src & Implemented Suggestions