cleanup & general refactor
stop symbolizing everything!