Cleaned up strcture