Some refactoring and cleaning up. (Postable bracket)