Redone commit that got overwritten

- Cleaned some shit up