Fixed all of the current warnings in the brach and reordered some imports for pretty-ification