Style adjustments, cleaned up/organized a bit