Semicolons and last usage of def removed :)