Cleaned up debug code and created optimization for layouts