Cleaned include, added size