cleaned up everything in an effort to simplify and sync