Removed unwanted whitespace
Fix pre-post names
Collapsed syntax