Quick cleanup ready for merging