Speed up / clean up pre/post functions
0.3.1