Update Prototype

Code cleaning continued