fixes #11 + cleaned up Metabox class