cleaning + prototype from Ludum Dare #30