pretty sure asterisks work; code cleaned up