Show must go on! Refactoring...