Cleaned up hld layout