removed class to simplify code