done #16, fixed formatting on some places