Added new level

And did some code cleanup