Commented code a bit