robbie: restructure and styling