Cleaning Code

Just cleaning some stuff up