Commented more of the code