Finished beautification. Started unit testing.