Praesentation, code cleanup