Fixing offsets up based on RHOST length and cleaning up indentation