Clean up getters and setters for all interactions. Plus Javadoc!