Code base cleaned, removed messy tab/space mix. Made more gulp like