cleaned up code and added statictable class for future table implementations