Cleaned up code
Added visual table