Commented code a bit more