Update code for better viewing