Cleaned up visually, respacing and renaming