Removed some whitespaces, included incs