Cleaned up layout and includes references.