Cleaned Code Up a Bit, added Trash Code. This may be the same as the hand user code

Signed-off-by: Andoni Aguirrezabal <aaguirrezabal@live.com>