Commented code, cleanup keys