cleanup, added common directive (basic), fixed jade formatting