cleanup, refatoring, debugging, layout