expand from rules to one habit

Also slightly cleans up formatting.