Cleanup and basic spike implementation