Clean up code

Just cleaning stuff up