cleanup, almost finished
final changes
refactoring
hotfix
huge refactoring