just cleaned up code a litte