less verbosity, formating
Revert f25d24f..b6dea94

This rolls back to commit f25d24f2dd8016461f74a0c5e04628ecd1ce1142.