Cleaned up some code, I did this a long time ago I just never commited it