Add comments and improve spacing