move things around for better readability