Cleanup & Better working environment