Removed dead code
Reformatted some code
Visibility toggling complete

Along with major performance improvements across the board.