Cleaned up basic-spring sample