Cleaned up unnecesary codes