Add spacing, some rules and pointer banishing