Clean up headers

Add missing comments and clearly separate methods from attributes.
2 files changed