updated comments and cleaned up the code