Adding build clean details; Cleaned up headers.