added tabs and cleaned up code using includes