Cleanup

Move statics to the front. Fixed formatting issues. Worn out.