Cleaned & Fixed Previous Commit