Cleanup more.

Signed-off-by: acappiello <acappiel@andrew.cmu.edu>
Forgot to round.

Signed-off-by: acappiello <acappiel@andrew.cmu.edu>
Formatting and cleanup.

Signed-off-by: acappiello <acappiel@andrew.cmu.edu>