Cleanup in Images classes

Cleanup in some class files (formatting mostly)