Cleaned sources a bit.