WIP

- Code cleanup