Added more comments and cleaned up the code