Commented & improved stuff