updated / cleaned up decencies