ughm... minor clean-up :)