cleaned code, started format class