cleaned up code a little bit before FJ starts working