Added better syntax for @before
Finished implementing @before syntax