Edited code and structure