changing the code structure

simplifying the add, add to world and draw functions