Edited minor code issues. Done