Minor Update, Mostly just formatting and updating deprecated methods