Clean up solution before merge to master. Filling documentation