Added kbd for commenting; Cleaned up a bit