updated core classes and did some reformatting