Cleaning stuff up

Cleaning stuff up