Cleaning up

Fixed enums and some using issues