Cleaned up general formatting