Commented code better