reorganised it a bit
deleted