Cleaner without the proc
Fixing style issues