Clean up naming and tidy