Debugging code/comments cleaned up.