Cleaned up, fixed formatting