cleaned up all the coding