Cleans up, refactors
Revises icon