Fixed indent and some changes to the old way of doing stuff