Refactoring and image edits.