Reformatted to comply with WP source code layout standards, as well as starting to implement suggestions from Taylor Dewey