Cleaned up title module