Moved content around for readability