Refactoring
Deleted some trash