Some clean up and refractor. Custom size image constructor .