Cleaned up scaffold code