cleaned some cpp up .. shrunk so functions.. makes it easier to read ..