More readable and got rid of some useless comments