Organized and updated code