Cleaned up from earlier changes