Code reviewed boilerplate

Added to-dos throughout