simplify the code. pointed out while writing the wiki
cleanup of design files