Cleaned more unneccessary code and made it neater.